Fix LogicalToBooleanRector: parenthesize assignments nested under unary/binary operators#8184
Merged
Merged
Conversation
3d1cd0f to
2fd1aa5
Compare
…ators in LogicalToBooleanRector (#9807, #9808)
2fd1aa5 to
03af320
Compare
Member
Author
|
👍 |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Fixes rectorphp/rector#9807 and rectorphp/rector#9808
LogicalToBooleanRectorswapsand/or(low precedence) for&&/||(high precedence). An assignment operand must then be wrapped in parentheses to keep the original semantics. This worked for a direct assignment operand, but not when the assignment was nested one level down — under a unary operator (!,~,+,-,@, casts) or as an operand of a binary operator when it was a compound assignment (+=,-=, …). The result changed runtime behaviour, and~$x = ...even produced a fatalTypeError.Before / after
All reported forms now print correctly:
Fix
Handled in
LogicalToBooleanRector, not the printer. When the operator is swapped, each operand is walked and any nested assignment (Assign/AssignOp/AssignRef) — reached through a unary operator (!~+-@, casts) or through binary operators — is marked to reprint. The pretty-printer then re-adds the precedence parentheses via its existing generic mechanism.This keeps the logic on the
LogicalOr/LogicalAndnodes the rule already subscribes to, instead of running per-node bracket checks inBetterStandardPrinteron every print.Covered by 5 fixtures. Existing printer +
LogicalToBooleanRectortests stay green.